From: Glenn Morris <rgm@gnu.org>
Date: Fri, 13 Feb 2009 03:44:10 +0000 (+0000)
Subject: (unrmail): When getting message keywords, don't include a leading
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~1826
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=13d6c1fe4137fd08ad72191853f93437f973f51e;p=emacs.git

(unrmail): When getting message keywords, don't include a leading
space, but do include the space after the separating comma.  (Bug#2303)
---

diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 749d3942006..86957813e1e 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -133,14 +133,16 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
 		  (buffer-substring (point)
 				    (save-excursion (forward-line 1)
 						    (point))))
-	    (search-forward ",,")
+	    (re-search-forward ",, ?")
 	    (unless (eolp)
 	      (setq keywords
 		    (buffer-substring (point)
 				      (progn (end-of-line)
 					     (1- (point)))))
-	      (setq keywords
-		    (replace-regexp-in-string ", " "," keywords)))
+	      ;; Mbox rmail needs the spaces.  Bug#2303.
+	      ;;; (setq keywords
+	      ;;; 	    (replace-regexp-in-string ", " "," keywords))
+	      )
 
 	    (setq attrs
 		  (list